From 1ab3d32808146b4e79e86facc3710eb91b8e4e28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Thu, 1 Dec 2016 19:33:38 +0100 Subject: [PATCH] revealer: Measure child widget size using gtk_widget_measure --- gtk/gtkrevealer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index c9e7693824..e42be2e37b 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -316,11 +316,13 @@ gtk_revealer_get_child_allocation (GtkRevealer *revealer, transition = effective_transition (revealer); if (transition == GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT || transition == GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT) - gtk_widget_get_preferred_width_for_height (child, MAX (0, allocation->height - vertical_padding), NULL, - &child_allocation->width); + gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, + MAX (0, allocation->height - vertical_padding), + NULL, &child_allocation->width, NULL, NULL); else - gtk_widget_get_preferred_height_for_width (child, MAX (0, allocation->width - horizontal_padding), NULL, - &child_allocation->height); + gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, + MAX (0, allocation->width - horizontal_padding), + NULL, &child_allocation->height, NULL, NULL); } child_allocation->width = MAX (child_allocation->width, allocation->width - horizontal_padding); -- 2.30.2